Skip to content

gh-120343: Fix column offsets of multiline tokens in tokenize#120391

Merged
lysnikolaou merged 2 commits into
python:mainfrom
lysnikolaou:fix-fstring-middle-after-expr-tokenize
Jun 12, 2024
Merged

gh-120343: Fix column offsets of multiline tokens in tokenize#120391
lysnikolaou merged 2 commits into
python:mainfrom
lysnikolaou:fix-fstring-middle-after-expr-tokenize

Conversation

@lysnikolaou

@lysnikolaou lysnikolaou commented Jun 12, 2024

Copy link
Copy Markdown
Member

@pablogsal

Copy link
Copy Markdown
Member

Hummm, seems that this doesn't work as we still have some broken tests :(

@lysnikolaou

Copy link
Copy Markdown
Member Author

Oops. Fixed now.

@pablogsal pablogsal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the fix @lysnikolaou

We want a NEWS entry probably, no?

@lysnikolaou

Copy link
Copy Markdown
Member Author

The news entry in #120352 is probably good enough. What do you think?

@pablogsal

Copy link
Copy Markdown
Member

The news entry in #120352 is probably good enough. What do you think?

Agreed 👍

@lysnikolaou lysnikolaou merged commit 4b5d3e0 into python:main Jun 12, 2024
@miss-islington-app

Copy link
Copy Markdown

Thanks @lysnikolaou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 12, 2024
…ythonGH-120391)

(cherry picked from commit 4b5d3e0)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@bedevere-app

bedevere-app Bot commented Jun 12, 2024

Copy link
Copy Markdown

GH-120427 is a backport of this pull request to the 3.13 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 12, 2024
…ythonGH-120391)

(cherry picked from commit 4b5d3e0)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@bedevere-app bedevere-app Bot removed the needs backport to 3.13 bugs and security fixes label Jun 12, 2024
@bedevere-app

bedevere-app Bot commented Jun 12, 2024

Copy link
Copy Markdown

GH-120428 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Jun 12, 2024
lysnikolaou added a commit that referenced this pull request Jun 12, 2024
…H-120391) (#120428)

(cherry picked from commit 4b5d3e0)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
lysnikolaou added a commit that referenced this pull request Jun 12, 2024
…H-120391) (#120427)

(cherry picked from commit 4b5d3e0)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants